Move up forward declaration of BablList.

* babl/babl.h: Move up forward declaration of BablList.

* babl/babl-list.h: Completely rely on that declaration.

svn path=/trunk/; revision=372

diff --git a/ChangeLog b/ChangeLog
index b6d747005f83c1d9ec4364ca3a30c9eb6fc02ee6..7822438301c9ac7d56e0f238aac0d226fd8ee9c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-17  Martin Nordholts  <martinn@svn.gnome.org>
+
+       * babl/babl.h: Move up forward declaration of BablList.
+
+       * babl/babl-list.h: Completely rely on that declaration.
+
 2009-01-17  Martin Nordholts  <martinn@svn.gnome.org>
 
        * babl/babl.h: Don't have BABL_ALPHA_THRESHOLD public yet.

diff --git a/babl/babl-list.h b/babl/babl-list.h
index 7b35dea875077c3f68552c6b165450cd45734b84..d38eb6d853482fcc8370def3f313d227b368abbb 100644 (file)
--- a/babl/babl-list.h
+++ b/babl/babl-list.h
@@ -20,20 +20,15 @@
 #define _BABL_LIST_H
 
 #ifndef _BABL_H
-/* babl.h contains forward declaration
- * typedef struct _BablList BablList;
- */
 #error  babl-list.h is only to be included after babl.h
 #endif
 
-
-typedef struct _BablList
+struct _BablList
 {
   int  count;
   int  size;
   Babl **items;
-} _BablList;
-
+};
 
 BablList *
 babl_list_init (void);

diff --git a/babl/babl.h b/babl/babl.h
index a62ad79f2045a146468378b8e3939f39a16c4506..d6fa2193c5e9dbac632a2eb3bc6d63d25ce36fad 100644 (file)
--- a/babl/babl.h
+++ b/babl/babl.h
@@ -33,6 +33,8 @@
 #include "babl-macros.h"
 #include "babl-main.h"
 
+typedef struct _BablList BablList;
+
 /* magic number used at the start of all babl objects, used to do
  * differentiation in polymorphic functions. (as well as manual
  * type check assertions).
@@ -68,8 +70,6 @@ typedef int BablClassType;
 
 typedef union _Babl Babl;
 
-typedef struct _BablList BablList;
-
 typedef int  (*BablEachFunction) (Babl *entry,
                                   void *data);